Skip installation of new ostree-finalize-staged.path unit, which should be in ostree...

diff --git a/debian/changelog b/debian/changelog
index 6af1db3066353bc32995867908cc4f78064518a0..c3e67359b8f21eea1d9592592df1fffba72c3c88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ostree (2018.9.1-1) UNRELEASED; urgency=medium
 
   * d/tests/build: Mark as superficial (see #904979)
   * New upstream release
+  * Skip installation of new ostree-finalize-staged.path unit, which
+    should be in ostree-boot when added (see #824650)
 
  -- Simon McVittie <smcv@debian.org>  Wed, 17 Oct 2018 08:34:52 +0100
 

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 195e5d1d820249632c5121b9e34a61d38f2a4bbf..67b8681f1811f89c1b60ad8d1115f8bd239199c0 100644 (file)
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -1,6 +1,7 @@
 etc/dracut.conf.d/ostree.conf
 etc/grub.d/15_ostree
 lib/systemd/system-generators/ostree-system-generator
+lib/systemd/system/ostree-finalize-staged.path
 lib/systemd/system/ostree-finalize-staged.service
 lib/systemd/system/ostree-prepare-root.service
 lib/systemd/system/ostree-remount.service

diff --git a/debian/rules b/debian/rules
index 223050d07d2c0c7494dff8e162e82bbea2e0280d..792905fc04341bfe6dfa95025167882df890c7cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,7 @@ override_dh_install:
        rm -f debian/tmp/etc/dracut.conf.d/ostree.conf
        rm -f debian/tmp/etc/grub.d/15_ostree
        rm -f debian/tmp/lib/systemd/system-generators/ostree-system-generator
+       rm -f debian/tmp/lib/systemd/system/ostree-finalize-staged.path
        rm -f debian/tmp/lib/systemd/system/ostree-finalize-staged.service
        rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
        rm -f debian/tmp/lib/systemd/system/ostree-remount.service